From 10be371224377fbf870bb0b19548a46ce18b7193 Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Wed, 1 Jul 2026 21:50:44 +0200 Subject: [PATCH] Revert "(Build-)Depends: tao-pegtl-dev to support external PEGTL (tao)" This reverts commit 40a6ef7735852b03253692722eeb812e3e8b6ef2. tao-pegtl-dev 3.2.7 is not compatible with vtk 9.6. There was MR !11999 to update VTK, but it has been abandoned, and does not merge cleanly into current source. https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11999 See also https://gitlab.kitware.com/vtk/vtk/-/work_items/17876 https://gitlab.kitware.com/vtk/vtk/-/work_items/18151 Cannot close Bug#1035426 until upstream sorts out their pegtl support. --- debian/changelog | 4 +--- debian/control | 2 -- debian/rules | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90ab3278e..cde5d380e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,7 @@ vtk9 (9.6.2+dfsg1-1exp5) UNRELEASED; urgency=medium - * (Build-)Depends: tao-pegtl-dev to support external PEGTL (tao) - with -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON * install vtkQImageToImageSource.h and vtkQWidget* headers to - libqt9-qt-dev not libqt9-dev. Closes: #1035426 + libqt9-qt-dev not libqt9-dev. See Bug#1035426. * debian patch build_reproducibility.patch maintains build reproducibility by dropping XDMF_SYSTEM (which is set to CMAKE_SYSTEM, including the Linux version at build time) from diff --git a/debian/control b/debian/control index 9a4eb1ab8..417fab164 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,6 @@ Build-Depends: dpkg-dev (>= 1.22.5), python3-mpi4py, qt6-base-dev, texlive-binaries, - tao-pegtl-dev, x11proto-core-dev, xauth, xvfb, @@ -128,7 +127,6 @@ Depends: ${misc:Depends}, mpi-default-dev, python3-vtk9 (= ${binary:Version}), vtk9 (= ${binary:Version}), - tao-pegtl-dev, x11proto-core-dev, zlib1g-dev Suggests: vtk9-doc, diff --git a/debian/rules b/debian/rules index ee7f961d0..eb2d997c8 100755 --- a/debian/rules +++ b/debian/rules @@ -79,7 +79,6 @@ extra_flags += \ -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_ogg:BOOL=ON \ - -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_theora:BOOL=ON \ -- 2.30.2